From: Keir Fraser Date: Mon, 6 Apr 2009 12:56:35 +0000 (+0100) Subject: x86_64: explicitly zero CR[1] in getvcpucontext for guests with no user PT X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~13989^2~3 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=a5428a4b5f54fa660b37d8eec88a69700f6f8352;p=xen.git x86_64: explicitly zero CR[1] in getvcpucontext for guests with no user PT Signed-off-by: Ian Campbell --- diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 1d748f6f15..955c5e6088 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1161,9 +1161,9 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) c.nat->ctrlreg[3] = xen_pfn_to_cr3( pagetable_get_pfn(v->arch.guest_table)); #ifdef __x86_64__ - if ( !pagetable_is_null(v->arch.guest_table_user) ) - c.nat->ctrlreg[1] = xen_pfn_to_cr3( - pagetable_get_pfn(v->arch.guest_table_user)); + c.nat->ctrlreg[1] = + pagetable_is_null(v->arch.guest_table_user) ? 0 + : xen_pfn_to_cr3(pagetable_get_pfn(v->arch.guest_table_user)); #endif /* Merge shadow DR7 bits into real DR7. */